Some markup updates. Some code moved to ProjectPresenter
Fix