Resolving git issues
More stuff, icons and functionality