Changed layout. Fixed cache clearing.