Fix strings and flip partially watched flag
Pretty up views
MERGE