Simplify DetailScreen & View
Reformat code