did some layout changes