Feature/improving views