Nicer icons and layout