Feature/enhanced scroll bar2