Various refactoring efforts and adding additional logos
Modified names of icons to allow for images that may have numbers to start. Modified authentication to be more robust in case of hung auth attempt