Add title bar
Add Singleton, fix player id and cleanup