Simplifying layout and functionality, changing title