design improvments
design