css changes
small css changes
merge conflicts
added some scrolling to div on click