Proper spacing of layout

Spaced out layout to show things better. Few operations are broken or
not yet working though.