Refine style / Fix not-clickable bug