layout and adapter changes