Changes for Menu controller