Refactor achievement views