View part refactored.