Update settings display + fixes