Changed to init list
Refactoring the UI system