Update the look of things a bit
Make return easier