Updated UI. Working on file consolidation.