Cleanup;
Converted remaining optional detail view items to fragments;