Updated styling and added a file panel.
Fixed merge conflicts.