fix collapsable button and focus states