Layout fixes and additions (debugging).