simplified buttons and edit button implemented