Fix for merge issue in css file on guidance merge
Fix for merge issue in css file on guidance merge

Also fixes for css warnings/errors

WeaveTeam/WeaveJS,WeaveTeam/WeaveJS,WeaveTeam/WeaveJS,WeaveTeam/WeaveJS