Loads of cleaning up. Integerated UI and backend for a couple of activities.