Other forgotten parts

* Added layout changes