LPS-42188 - Prevent input fields overlapping
LPS-42188 - Source formatting