Code review
Fix screen rotation issues