Bug fixes.
BackOffice and Layout update