fine styles
Merge branch 'developer/davidsingal' into dev

* developer/davidsingal:
  fine styles
Merge branch 'dev' into smbtc

* dev:
  fine styles