Refactor achievements form