#324: adding labels instead of buttons