Added view-side components