Looks much better

icons and layouts