Fixed some layout warnings