Better menu handling + callbacks
Better menu handling + callbacks