scrollview fix and ui consistency changes