Refactor
Updating demo
Fix position
Change style
Render
Updates