add database info
Font play
Fix conflicts
Add fonts and button
Resolve git conflicts