minor adjustments and design themes