Version 0.4.2 - Better menu handling