A big design update and some tweaks