Fixed short dataType issue. Updated UI
Updated UI