Fix some issue with force base Layout