Minor Changes to look nicer