fixed editing and viewing usability