new UI (second part)
some bugfixes