Form changes, some CSS changes