fix desing, fix strings