[AM] Refactoring + Main Activity Orientation Changes