Made some layout changes