Updated panels layouts and removed rules based caching as caching is defined later