Adding screen align to the input fields (working fine)

Code refactoring