#CEXT-22 comment - added bottom bar with buttons