Changed Icon and a few minor changes