Added in a modal component, closes #67
Added in a sidebar wrap component
Reindented