Small Configuration screen fixes