Trying to style the icons. And code clean up.