Moved upload and filter into widget box, tidy up UI