Fixed a few general layout aspects