Cleanups, slides order, adding icons