formatting tweaks and adding icons