more layout improvements in sample app 1