Added some layout fixes.