removed action bar handling code
updated version