Improve design of panels