Separate plot/marker control from MainPanel and further UI improvements