Fixed top bar  issues.