Updated form styles
Fixed DB merge conflicts