Improve design and clear out old JS