UI changes for view and upload solution