Implemented reactivity and UI tweaks