Baby steps towards a proper master page