cleaned up and added filters on rectangle view