Added a tab bar as well as other updates