Correcting navigation

corrected navigation, finished the lists and settings