A little bit changing

Moving panel into main panel and info panel