diff --git a/src/compatibility/5.0/android-5.0-cdd.xhtml b/src/compatibility/5.0/android-5.0-cdd.xhtml
index 76c50ac..08a7a4f 100644
--- a/src/compatibility/5.0/android-5.0-cdd.xhtml
+++ b/src/compatibility/5.0/android-5.0-cdd.xhtml
@@ -95,8 +95,7 @@
 <p><a href="#heading=h.ifi3tjbpjckl">3.8.12. Location</a></p>
 
 <p><a href="#heading=h.ugmg9aj091f8">3.8.13. Unicode and Font</a></p>
-</td>
-    <td>
+
 <p><a href="#heading=h.yyjxs5mhy231">3.9. Device Administration</a></p>
 
 <p><a href="#heading=h.ynv25r97q6m">3.10. Accessibility</a></p>
@@ -123,7 +122,7 @@
 
 <p><a href="#heading=h.vtmgyrsev5dt">5.4. Audio Recording</a></p>
 
-<p>        <a href="#heading=h.ng7fac8ci8vj">5.4.1. Raw Audio Capture</a></p>
+<p><a href="#heading=h.ng7fac8ci8vj">5.4.1. Raw Audio Capture</a></p>
 
 <p><a href="#heading=h.sro7nvcaeuc1">5.4.2. Capture for Voice Recognition</a></p>
 
@@ -169,6 +168,142 @@
 <table>
  <tr>
     <td>
+<p><a href="#heading=h.try1r2p8m3vf">7.1.3. Screen Orientation</a></p>
+
+<p><a href="#heading=h.r5sa5dwl0cjh">7.1.4. 2D and 3D Graphics Acceleration</a></p>
+
+<p><a href="#heading=h.r1yeedum5wsi">7.1.5. Legacy Application Compatibility Mode</a></p>
+
+<p><a href="#heading=h.dvbqyf6vof9p">7.1.6. Screen Technology</a></p>
+
+<p><a href="#heading=h.yeaulmskczp3">7.1.7. External Displays</a></p>
+
+<p><a href="#heading=h.1rhjcel5zbe5">7.2. Input Devices</a></p>
+
+<p><a href="#heading=h.egbk02citmz">7.2.1. Keyboard</a></p>
+
+<p><a href="#heading=h.h86aqgcxrqbz">7.2.2. Non-touch Navigation</a></p>
+
+<p><a href="#heading=h.dzfhwcjzm5z6">7.2.3. Navigation Keys</a></p>
+
+<p><a href="#heading=h.p7pmjzzatkph">7.2.4. Touchscreen Input</a></p>
+
+<p><a href="#heading=h.7tz929qk2hjr">7.2.5. Fake Touch Input</a></p>
+
+<p><a href="#heading=h.sdgxpot7e9ff">7.2.6. Game Controller Support</a></p>
+
+<p><a href="#heading=h.e96izopb7n42">7.2.6.1. Button Mappings</a></p>
+
+<p><a href="#heading=h.eija3q5owqll">7.2.7. Remote Control</a></p>
+
+<p><a href="#heading=h.j40lqogjtait">7.3. Sensors</a></p>
+
+<p><a href="#heading=h.3u857dtnrtuj">7.3.1. Accelerometer</a></p>
+
+<p><a href="#heading=h.sf5gr3iz7tz4">7.3.2. Magnetometer</a></p>
+
+<p><a href="#heading=h.2x1nre62p60d">7.3.3. GPS</a></p>
+
+<p><a href="#heading=h.kczbjun4pvap">7.3.4. Gyroscope</a></p>
+
+<p><a href="#heading=h.vmgl07rl8eir">7.3.5. Barometer</a></p>
+
+<p><a href="#heading=h.7gtmh7pqnekm">7.3.6. Thermometer</a></p>
+
+<p><a href="#heading=h.nbgggpsrc5wj">7.3.7. Photometer</a></p>
+
+<p><a href="#heading=h.gus8hybydyk8">7.3.8. Proximity Sensor</a></p>
+
+<p><a href="#heading=h.7y7dtt5ikji6">7.4. Data Connectivity</a></p>
+
+<p><a href="#heading=h.u12n5f7z5iiq">7.4.1. Telephony</a></p>
+
+<p><a href="#heading=h.39g0jrqcl40">7.4.2. IEEE 802.11 (Wi-Fi)</a></p>
+
+<p><a href="#heading=h.82i6ovyqynfx">7.4.2.1. Wi-Fi Direct</a></p>
+
+<p><a href="#heading=h.aia2dpbgueab">7.4.2.2. Wi-Fi Tunneled Direct Link Setup</a></p>
+
+<p><a href="#heading=h.420i0exy2mxj">7.4.3. Bluetooth</a></p>
+
+<p><a href="#heading=h.twzy3bitgp2k">7.4.4. Near-Field Communications</a></p>
+
+<p><a href="#heading=h.sg0l1jarhok9">7.4.5. Minimum Network Capability</a></p>
+
+<p><a href="#heading=h.7agkwed6used">7.4.6. Sync Settings</a></p>
+
+<p><a href="#heading=h.ups9ebpvb6ja">7.5. Cameras</a></p>
+
+<p><a href="#heading=h.v6dmzvarwqkm">7.5.1. Rear-Facing Camera</a></p>
+
+<p><a href="#heading=h.xze6dyxaadh9">7.5.2. Front-Facing Camera</a></p>
+
+<p><a href="#heading=h.q85mgg9m8zhf">7.5.3. External Camera</a></p>
+
+<p><a href="#heading=h.s349dbv4ffl4">7.5.4. Camera API Behavior</a></p>
+
+<p><a href="#heading=h.zguadou53wls">7.5.5. Camera Orientation</a></p>
+
+<p><a href="#heading=h.bodawgb0ngf8">7.6. Memory and Storage</a></p>
+
+<p><a href="#heading=h.q4aoj3xvrlxe">7.6.1. Minimum Memory and Storage</a></p>
+
+<p><a href="#heading=h.8qr43vll8ow">7.6.2. Application Shared Storage</a></p>
+
+<p><a href="#heading=h.rp4zc78xvn6s">7.7. USB</a></p>
+
+<p><a href="#heading=h.fzr0lrcrrfak">7.8. Audio</a></p>
+
+<p><a href="#heading=h.74o7ndqnyrjr">7.8.1. Microphone</a></p>
+
+<p><a href="#heading=h.ro0d402dzkaq">7.8.2. Audio Output</a></p>
+
+<p><a href="#heading=h.luy58niin3j">7.8.2.1. Analog Audio Ports</a></p>
+
+<p><a href="#heading=h.v33sc890yqtg">8. Performance Compatibility</a></p>
+
+<p><a href="#heading=h.jyh6oga0ubgs">8.1. User Experience Consistency</a></p>
+
+<p><a href="#heading=h.9vv5a25p8zcz">8.2. Memory Performance</a></p>
+
+<p><a href="#heading=h.a32osmf1tmwt">9. Security Model Compatibility</a></p>
+
+<p><a href="#heading=h.rj8bxiqpff6s">9.1. Permissions</a></p>
+
+<p><a href="#heading=h.p4gtpuihccdf">9.2. UID and Process Isolation</a></p>
+
+<p><a href="#heading=h.en5p20nyss66">9.3. Filesystem Permissions</a></p>
+
+<p><a href="#heading=h.p5sjwl72r3oz">9.4. Alternate Execution Environments</a></p>
+
+<p><a href="#heading=h.xspotnaue6fc">9.5. Multi-User Support</a></p>
+
+<p><a href="#heading=h.7b5lq2p9nv4j">9.6. Premium SMS Warning</a></p>
+
+<p><a href="#heading=h.io2qcx4xe6hh">9.7. Kernel Security Features</a></p>
+
+<p><a href="#heading=h.u9w027jkf7bb">9.8. Privacy</a></p>
+
+<p><a href="#heading=h.qq3tcq94r919">9.9. Full-Disk Encryption</a></p>
+
+<p><a href="#heading=h.ngllntwu29p6">9.10. Verified Boot</a></p>
+
+<p><a href="#heading=h.rafv96b0uwer">10. Software Compatibility Testing</a></p>
+
+<p><a href="#heading=h.7iuzt59bizon">10.1. Compatibility Test Suite</a></p>
+
+<p><a href="#heading=h.opluz3h21s0b">10.2. CTS Verifier</a></p>
+
+<p><a href="#heading=h.141487psajcw">11. Updatable Software</a></p>
+
+<p><a href="#heading=h.4et8ifl401m5">12. Document Changelog</a></p>
+
+<p><a href="#heading=h.codus8wcjysp">13. Contact Us</a></p>
+
+<p><a href="#heading=h.jhgs5yq2lqtj">14. Resources</a></p>
+</td>
+ </tr>
+</table>
 
 <h1 id=1_introduction>1. Introduction</h1>