adds trend indicator, view by room etc, refactors stuff