Fix some bugs with settings menu