Initial register layout
Layouts fixes.