Major changes: added settings menu and layout