Fixed merge and added Palette list layout