General methods are migrated to functions.php
Optimisation of menu
Fixes #23