Main views and main controller modified.
Merge branch 'pt-to-jq' of github.com:m-bodmer/Markus into pt-to-jq
Main views and main controller.