Clean up extras.php and add new features
Add new template tags for menu