Added heading links, re-ordered widget options