Updated to keep previous functionality with tab bar in place.