minor changes to layout and onclick action