Some layout changes
fixed merge conflict