Added settings (and other small changes)

Settings activity added but still needs to be worked out