aligned original layout buttons to top and bottom.
Reformat.
Merge branch 'Drassen-master'