Changed layout to nearer design.
Merge branch 'master' of github.com:radeinla/Fishbowl