Add Tab Bar and transitions

You can remove these commented out lines now?