Fixed bugs; added icons.