Making it a little smarter and cleaning up some styling