Remove unused css class
Code reformat
Fix widget rendering issue
Merge branch 'develop'

* develop:
  Fix widget rendering issue
  Code reformat
  Remove unused css class