Did a little UI work