cleaned up panel