cleaned up the code

removed the buttons and rewired the action bar icons.