Fixed folders and added more code to make more buttons work