Add error message
Make markup consistent with error page
Fix select layout issue