Temporary commit, some further adjustments but perhaps I broke the layout...I may need to revert.