Some cosmetics and a new edit-menu