Making changes to pom and fixing some ui issues.