admin module and some front-end changes