small layout changes, choose-view added