removed dependancy to HeaderView