Added infrastructure for narrator messages and tweaked layout