Updated UI, green HTML, additional tests