Refactored View
completed styling