GPII-1051: Cleanup of shared css
GPII-1051: Updated markup structure