Fixed a few more issues

Still working on sticky table header.