Bug fix

add button to view controller and squashed bugs