Update for UI1/2

Now it works properly! I need to wait the implementation of DB