updated baselayout