WSM-23 #modify submenu and move it to the top of the search bar && phpcs