Fixed functionality and layout to be random all the way through.