Improvements/custom view