Adding horizontal rules and other fixes