Design changes

Improving the design of some views