Adding layout and fixing file browser