Some bug fixes done and some commenting and some aesthetics in the settings view