FInished bottom scrollbar
merging