js-fill and better design