Code cleanup
Created Settings Activity