new layout bug fixes