Fixed one-two article bug and added nicer handling of when closing an expanded popup view