layout problems seem to be resolved