Rearranged features, remove redundant line items in design.