Fixed small changes to use markup in all places