Cleaning up and prettifying the product.
Merged with Robert's Changes