New layout/cleanup
Host color update
Merge pull request #30 from andrzejkala/layout-updates

Layout cleanup