Added cancel last return and book buttons rearrangment