Fix sizing problems in layouts
Clean up potential timeout leak
Defensive programming for timeouts