refactoring for L
improved quick return action bar
Merge remote-tracking branch 'origin/master'