Changed titles of the windows

and tweaked some things