Redid layout, much better now
new layout
Merge branch 'Layout-Alt'