Places buttons in nav-bar in application layout
Merge remote-tracking branch 'origin/master'