#16: Adding back the error messages via layout