Fix: move menus in templates files
SPEED-22 Fix: add trash system by default