Adding fixes to GetAll method and fixing layout