Adjusted GUI for future features