Fixed a few layouts