Fix file upload popup css and cleaning up of controller