Add :focus rules where :hover was, and reorganise css slightly

Change-Id: Ib277635ed9cf00eaa33719c60ed06afd5791433c