- continue refactoring presentation
 - fix compile issues
 - continue refactoring presentation on client