Design fixes, additions
JS temporarily hosted here