Merge "Fixed "Primary data" text style and rearranged UI vertically." into pi-dev