renamed CSS selector to avoid conflict names
Merge branch 'show_all' into development