-FIXED- Minor UI navigation bug