remove duplicated error messages, tweaks layouts