some minor changes
trying to add ui-scroll
merge