WIP - Trying to fix race condition problem
Made UI symmetric
Introduced dispatch queue to prevent race condition