Changed icons and other formatting