Cleanups

The data to be shown on templates must be retrieved on views