UI fix
cleanup