ui and pom fixes