Reworked the edit action, and tweeked the style some more