#41 - New checkout [theme]: fixed checkout steps