Fixed up everything, added icons.