Feature 4 initial tab fixes