it works and UI fixesss