Revert "t6: some small updates"

This reverts commit 48034b0b7e2318afc511cf8b043e876cead37e50.
t6: fix up panel display

Change-Id: I1717e16295d1c1be67069ae7385c5be69c959400