settings ux/ui improvements, badges checking etc.