Fixed various display issues
rewrote collections