CF-1CF-188: update layout & labels