Confirmation of some layout changes after testing