Added more logic for the SwFT panel