Two-step creation removed, just one tab now, tweaks everywhere