layout changes, bug fix