GUI config and some plugin changes