IPF-54: COMPLETED

- fixed a few more layout issues