fixed data structures and added styling