Fixed project
misc styling changes
Merge branch 'prettification'

* prettification:
  misc styling changes
  Fixed project