Fixed layouts & add restartUI