UI Updates, minor fixes