Window Position remembered

Plus a bit of a tidy up