Refactor version views