replaced buttons with an ordinary menu
rearranged menus in calendarview