account menu orders by 's_title' instead of 'title' now to handle unicode characters and did some code quality fixes
more code quality fixes