More UI enhancements; removed separate file handling.