Improved result cell design and refactored all classes