fix some glitches and finished the integration of the last texts and ui