A few changes

Sorry for all the white space, and the lousy first commits.

Maybe you won't agree with the icons I suggest but I doubt anyone can be opposed to the rest.