Fixed x axis scaling issue and a few visual tweeks