Use nice visual design implemented by @ryanfeeley