iPad UI refactoring; misc cleanup