tweaks to viewFlexibility, top margin to tabs
merge