improving styles + adding error messages