Second form stage, styling, etc fixes