Work on board and mainapp
Merging changes