UI modularized
Default war overlay
Merge branch 'feature/UI' into develop