Improve the layout navbar and the organization selector template