Continue panel refactor