Minor modifications related to UI and init