Improving base of the core layout