Layout improvemment