Settings UI revamped again