A nicer look and better functionality