reorganized data and made css nicer