Cleanup layouts and add tablet portrait layout.