retry
fixed some layouts