added header to files, layout fixes