Fixed a bug where the header was positioned wrong

Also cleaned up some logic about the translation

Change-Id: I6bfcb36ac27d8d6280e8ffea62b597d3bc705121
Fixes: 29880654
2 files changed