Visual tweaks.
Some refactor.