Changes related to faster UI development process