Updated the way the layout works