refactored edit and changed a bit of the layout