Added new optoins for graph, better mobile