IPF-54: COMPLETED

- fixed a few more layout issues
Merge branch 'feature/IPF-54' into develop