adding icons, tweaking button and other styles, change buttons to be toggles