implemented two more cell classes, fixed collection view layout