minor layout tweaks
Merge pull request #147 from coldstar96/layout-fixes-continued

minor layout tweaks