shitload of changes. Hide arrows from popup. Need to organise files now