adding menu and fixing layouts