Feature/admin

Review and merge.
Should these be:
```html
</div>
```