Design on here is hard to follow. Revamp?