Library Singleton
Updated User Interface