Fixing UI; adding CSS-based DOM change listenere; TODOs