- BZ-991487: fixing layouts to improve usability