More modal fixes
Refactor API and add "dumb" colors pagination