Added action bar menu item icon and some minor improvements.