fix and change layout, fix small bug loading data