refactored to be more comply to bono theme
Merge pull request #1 from reekoheek/master

[UPDATE] Refactored to be more comply to bono theme