UI fixes - file upload control and other minor fixes