Merge "Fix UI and docker"