Changed button ordering