completing  site  navigation and making more simpler code