Even more UI work, some bug fixes, looking much better visually.