Improve ui

I planet to wait with the merg until some little fetures are ready, but the chaches are do big and at the moment this branch is the real master.