Refactored Widget Custom UI and Storage Frame widget

@tejohnso please review.