Finished settings screen and fixed a few bugs