Layout update and bug fixes.