Changed behaviour when cells should load + small changes