HTML clean-up + new CSS form colors