Cleaning up the design on views