Form and CSS improvements