Making it pretty and adding some other things.