Updated CSS; form updates
Copied from master to rick branch
Merge remote-tracking branch 'origin/rick'