Fixed bugs with extract, rearranged display panel