Fixing merge issues.

Style changes to buttons.

Fixing merge issue with css map again.