add .private and .popup classes. Some other fixes