Adding in better views and additional data presenters