Form styles improved