Changed layout of components on canvas. Closes #142.