Many changes to the layout
Merge branch 'develop' of https://github.com/mcharcos/owb into develop