Some visual changes

And change some tabs to spaces