Slight Changes
Fixed merge conflicts
List view design Modifications