Layout resdesigned on MainDataEntry to be more consistant with the rest of Fire Alert Scanner
Merge branch 'maindata_layout' into new-master