changed the navbar focus issue and completed the UI change of website