refactored and added details screen