Code restructure to facilitate better removal, remove Export button form main screen