Added the ability to use custom view instead