Removed references to the tabbar
Fixed git problems in last commit