Still messing with styling on lists/show
Fixing mergey conflicts