Cleaned up scaffold; updated form CSS