UI improvements, configurations changes