Enhancing menu and home template