Fix input style
Adjust CSS
Merge branch 'hotfix'