Switched settings panels to use tip directive
Fixed conflict
Merge pull request #454 from rashidkpc/master

Switched settings panels to use tip directive