Nav changes, General layout changes
Merge branch 'master' of https://github.com/olsonkr/WesternHotelSupply