More style/theme cleanup
Fixed popup window style
Cleaned up more styles.