GUI: added some changes from MASTER branch

 - some of changes from commit, which can't be pushed to production yet,
 but GUI won't build without them.