Fixed bugs, added icon