Clean the code
Change star rendering
Fix bug on selector
Fix bug on selector(again)