Akshay: Fixing the menus of enter and view data