Fixed menu button and added popover menu.