Refactored buttons in the exporting module.
Fixed errors in dev branch
Merge remote-tracking branch 'origin/rambera' into rambera