Corrected overlapping icons and inputs