Frontend designish cleanup