Added panel stuff and some changes