added new up icon, changed location of file loading (again)
fixed merging conflict