merged quick return action bar improvements
merged quickreturn improvements