changes to layouts and GUI