Better use of custom panels