Removed border-radius from all input elements
Merged conflicts