Improved version of the master page.