first working version
text and layout fixes