loading collection and layout fixes