Improve Page layout