fixed button and env helper