Remap fixes for RA Engineer and SAM site

Adresses #4862 and #4876.

![remap-engineer](https://f.cloud.github.com/assets/2857877/2454902/219645ca-aef4-11e3-9aae-56a1841b414b.png)

![sam0003](https://f.cloud.github.com/assets/2857877/2454903/2a8425a8-aef4-11e3-9578-66aceaf9ea72.png)
![sam0002](https://f.cloud.github.com/assets/2857877/2454904/2f6b2558-aef4-11e3-9455-311bd61d5be6.png)
![sam0001](https://f.cloud.github.com/assets/2857877/2454905/34ec70a4-aef4-11e3-92f3-4b8728f44860.png)