Changed the MVC structure a bit. Activities are no longer the views