Fix bottom position
Fix right position
Use shared class method
Update demo