fixed again
Merge remote-tracking branch 'remotes/origin/Emil-Dev' into Dev-Lena
#CEXT-22 comment - added bottom bar with buttons