Rearranged features, remove redundant line items in design.
Merge pull request #10 from curtislacy/Cleanup-Features

Rearranged features, remove redundant line items in design.