Layout fixes, error message improvements