All forms updated and UI similar throughout