Add editing to, and improve, the main window UI