Fixes for right hand story package

- Fix layout so right hand stays next to article when comments are open
- Proper deduplication of story package trails
- Wrap markup output in switch