Base and Page template minor changes