Changed some things in the layout