More design improvements, many suggested by @sailorhg.