restructured a lot of stuff in system and heatmap. prepared all views to be very similar stylistically (and consistent in data structures)