Color Fix, Nav Refactor