Improved menu handling. Started to integrate calendar