Work on popup window layout, some tidying