removed the graph_mode option and fixed layouts