applied few changes for UI and error