Fixed nil location bug, tab bar now embeds navcontrollers instead of other way around, general refactoring