Layout fixes and refactor class names
Merge branch 'master' of https://github.com/digitalabs/IBPWorkbench