Changes tabbed interface to one where the relevant buttons are on the action bar
More changes to implement tabless transition
Brings view closer to mockups