Improve page structure