Style changes, form corrections