Design changes and form working