Removed more ScrollView nonsense