Added some more panels and functionality