Copy tweaks from bug #858821, note tweaked css for HP

late change from arcadio

Pull Request Fixes

pull request fix

arcadio tweaks to hp

final tweaks from arcadio