Added info, rearranged buttons