Main Layout update; added changes to settings