Cleanup work for CSS & page layouts