Changed some text + removed calendat UI