fixes for viewlets and editing