some cleanup; add scroll bar