Add validation and refactor form location
Signed-off-by: Spencer Deinum <spencerdeinum@gmail.com>