Major changes to form styling