Panels formatting improvements