Fixed settings menu not reflecting changes sometimes