Added custom view components