Tweaked style and added icons