Marc: Rearranged button and a created invoice panel