Refactoring empty state. Rearrange code / functions for future multirele...

...ase testing