reworked and added some new stuff to gui windows