Cleaned MakePanels and removed RentalWindow