made cleaner code and added navbar