Merge branches 'wip' and 'master' into wip
Changing the layout to a vertical one
Merge branches 'master' and 'wip'