Made the layout responsive.
Merge branch 'master' into stubs
Forget to clean up some comile stuff last time.