Revamp add_edit layout