Begin preliminary folder support; minor UI changes