Fix double refreshing in Master View