removed buggy button behavior
merge issues