gc button and pom fixes