Changed layout, updated create and edit forms