added errors to layout
fixed merge conflict