Feature/folder new

This is the UI PR that goes along with folder implementation.  I've included some of Xiyang's previous PRs in this one.