Updated highlighting active button
Merge remote-tracking branch 'origin/master'
Updated display policy from server