Tidied up form

Tidied up about window