Improved front-end data presentation.
Some minor refactoring.