changed to inline editing, improved styling