Refactoring. Started work on display view