GPII-118: Hover/focus styling
Merge branch 'GPII-118' into GPII-122