fixed demo full view bug and other changes