View: refactoring
View: bug fix for Text component