Correct topBar file

Correct topBar file, merge failed a lot.

I also rearranged indentation.