adding state
simplifying view to just buttons, adjusting
merging