Cleaning up and experimented with new Layout and styling