Several changes while getting 'plot' panel working