Added possibility to build and updated ui