Fixed randomization and added more level layouts