Added action bar button and comments