pom updated + small changes at FE