Fixed merge problems
Detail view now scrollable