Menu and dashboard cleanup