* fix format
* remove headers from popup's