Replaced some things with tables, now things are actually sensible