Class shells modified and more UI shells added