Fixed bugs, added icons