Add basic hover and focus styles
Merge branch 'dev'