Added form and work on layout

Maybe chance this endpoint to something that makes a little more sense?