Refined the UI some more ...