new UI, draft 4, minor changes