Move to toolbar and improve Files page