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

This reverts commit 3cee5eeec99b354d66dab6f503522de6a31d23d9.
Revert commit