Settings Activity added

Other bug and crash fixes