A few changes with regards to layouts