#8 fix markup in master page