After adding preferences and UI improvements