Layout bug fix in files
Fix #380
#379
#381