removed createbutton and added actionbar button
solved conflicts