GPII-118: Hover/focus styling
GPII-118: Removed commented out markup from panel templates