More work on iPad UI, pardon the mess...