more improvements to fitpeaks layout