Many updates, tweaks to new design