Now handles screen rotation