some layout and texts fixes