Layout restore now working (Its very slow though)