more fixes on apply form