Did some layout changes