Changes to make stuff look nicer