fixed bugs in cms