Code Cleanup,  now saves layout,size,pos, layout reset button added