Fixed up main panel