Added backgrounds and border around forms.
fix coverage json merge conflict