:Changed dashboard button style
:Resolved conflict