Fix markup, add graph option updating