Added click support and underline for primary finger position