target blank added to urls, minor indentation issues fixed, more urls moved to params