Resolving COnflicts from merge
Creating navbars and improving layout from application
Improving Layout for Registration and Sign In