Fixed some core panels