Added border and labels to export panel and cleaned up code.