Updated color states and navigation