MainPanel, Panel -> FilePanel, small fixes