Improvements to resource show page styling
front end updates
resolving conflicts