#117

Design improvements (or at least I like to believe so)