Added both split and stacked views and prototype of sidebar
Merge branch 'master' of https://github.com/timcolonel/hourglass