Preparing for file upload, minor UI improvments