Improve Static Pages