fix image and button layout
simplify calendar