Refactored UI - built using Mustache now