Improve the element panel system