Simplied data loading process so all data is loaded always.
Fix layout.