Fixed ordering deprec warning and updated Resto ol -> ul