Some comments and small error fixes

Fixed some errors in collectData
Added layout and some button functionality

Added layout and some button functionality to analyseData class. File
and folder modal dialogs are working and update the textCtrl fields
associated with them