fixed synchronization, deadlock extracted
prettyfied UI with AppConstants