Updated form styling, cleaned code