Fix layout
Refactor, create just one file (not two) with all data
Fix layout