Wrapped long layouts in scroll views; UI bug fixes