Clean up theme visually
Design formatting