updated to api level 21. removed unused stuff. using toolbar