Fixed edit and another small layout change