Refactored weighins views