Heatmap layer works in separate file, need to integrate into app; restructured layout