Remodified baselayout so it can match ours (Argent)