Undid some popup look&feel changes

Caused some issues with other  themes