layout changes

Some layout changes