finished merge of CLock and mENU