Alignment and fixes for mobile device