added icons, and connected buttons