Rearranged some button stuff.