layout fixed
restart bugs fixed