Removed presenters and moved to draper decorators for convenience