Improvement on Quick Panel