inline editing, namespace refactor, layout fixes