fix empty state, cleanup unused dom structure