wlfPanel cleanup and simplification