Added Navigation, updated Colors