Tidying directive naming
Tidying view layout