Rewrite to simplify process for customers
Js / design updates