working on expand btn, minor fixes