Updated adapters and screen rotate behavior