Settings menu tweaks

Investigated unclean code, attempted to fix issues.