Update to styling & validation