Bug fixing and icon addition