Layouts and messages improvement