Removed layout bug caused by error messages