Added custom view, organised slightly