Layout changes (WEB-5332)