more edit behavior, improved styling, refactoring