Change application layout to work with bootstrap
Merge remote-tracking branch 'origin/master'