Revert "minor bugfixs"

This reverts commit 46e32973e18231c994f6694c1fb253ee390ed1a1.
Changing scrollview with fragments to listview

nt