Settings bugs fixed