Deleted css, using showCOnstraints = false to not show helper text
fixed merge conflict