Brush up UI, still minimal, but useful already