Removed code wells and changed input border colors