Even more design changes
VERY DESIGN SO FIXES MANY BEAUTY