added message, extra layout and ...