Fix navigation and add file icon