Update to CSS
Form cleanup