New texts and some layouting, bugfixes