More accurate layout