Added moon icon image, refactored and cleaned up a little.