Changed layout & fixed variation to last