Fixed layering.
TODO.
Merge branch 'develop' of github.com:xeophin/ArtCritic into develop
Merged.