Refactored views & templates