Improve site skeleton layout