Cleaning up layout, working on zoom and magnitude filter