Fixed Settings UI mess, v2.1