Do HTML in php instead of javascript.

This way it can be changed by the theme and such.
I also changed the HTML from <ul> to <table>.
Merge branch 'extra-holdings' into merge