Revert "keeping up"

This reverts commit 993e6846a5a39f577f02d64ffb0d2015cdfb9d7d.
Revert "Placing error element next to <input> instead of in control-group"

This reverts commit fd281e1b0d3c9cf1091b753b0ba0221f149b70a0.