updates to views and controller
fixed show conflict
controller update
controller update