Major changes to UI and adding new features