added icons and fix spacing bug