Add back icons.
Formatting & use checked out branch in commit view.
More refactorings and minor fixes