Removed useless root FrameLayout, renamed text views