diff --git a/layouts/RJournal.layout b/layouts/RJournal.layout
index cef88f4..51cf9ae 100644
--- a/layouts/RJournal.layout
+++ b/layouts/RJournal.layout
@@ -58,14 +58,17 @@ Style Abstract
 	EndFont
 End
 
-InsetLayout "Flex:Address"
-	LabelString           "Address"
+Style Address
+	Category	      FrontMatter
+	Margin                Static
 	LatexType             Command
-	LaTexName             address
-	LyXType               Custom
-	LabelFont
-	  Color               latex
-	EndFont
+	LatexName             address
+	ParSkip               0.4
+	BottomSep             1.5
+	ParSep                1.5
+	Align                 Left
+	AlignPossible         Block, Left, Right, Center
+	LabelType             No_Label
 End
 
 InsetLayout "Flex:Email"
@@ -77,4 +80,3 @@ InsetLayout "Flex:Email"
 	  Color               latex
 	EndFont
 End
-
diff --git a/templates/RJournal.lyx b/templates/RJournal.lyx
index c46d174..b1522ed 100644
--- a/templates/RJournal.lyx
+++ b/templates/RJournal.lyx
@@ -293,11 +293,7 @@ bibfiles "biblio"
 
 \end_layout
 
-\begin_layout Standard
-\begin_inset Flex Address
-status collapsed
-
-\begin_layout Plain Layout
+\begin_layout Address
 Author A
 \begin_inset Newline newline
 \end_inset
@@ -313,11 +309,6 @@ arg   "newline-insert newline"
 \end_inset
 
 address here
-\end_layout
-
-\end_inset
-
-
 \begin_inset Newline newline
 \end_inset
 
@@ -334,17 +325,8 @@ author.a@email
 
 \end_layout
 
-\begin_layout Standard
-\begin_inset Flex Address
-status collapsed
-
-\begin_layout Plain Layout
+\begin_layout Address
 Author B
-\end_layout
-
-\end_inset
-
-
 \begin_inset Newline newline
 \end_inset