Improved layout
Merge branch 'angular' of github.com:pfatyga/CS443 into angular