some styling done on welcome page
Fixed margin on navbar
fixed conflicts