Optimized input fields a little bit