UI changes for Menu based