Can now make folders and added UI improvements