HG-196 top bar offset

Don't commit the `|| []`, this should be addressed by @hakubo's tracking codee