Beta ui

Merge to get other database