Merge pull request #3 from Delawen/ui_improvements

Ui improvements
Fixing layout bug on facets. If we use more than one row and delete facets, the blank spaces are not filled.

Also, discovered another strange bug, which has been patched. Marked with a FIXME note as it should have a better solution.