extracted layout and added active nav to menu