add ability to disable topBar scroll + some code style