Code refactor:

	- Moved some repeated code in views into partials
	- Improved the data parsing to show more detailed information