Fixed some bugs with settings menu