styled UI so be consecutive
fixed merged conflicts
Merge pull request #37 from chinenyem/master

styled UI so be consecutive
finish styling  UI
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team5
Merge pull request #38 from chinenyem/master

	finish styling UI
resolve merge conflicts