Added check for empty list, and bounce back to previous panel