- Menu from database
- Latest tweaks and modifications after merge