Improve .expandable_target focus styles

Sorry for the extra commits. Needed to get synced up with the upstream or something.