Fixed according to review. Miss the tooltip part, will add it later.