edited MainPanel
fixed conflict