layout
layout fixes
Merge branch 'Dev' of https://github.com/innoist/EPMS into Dev