Added some icons, file position changes