text styles adjusted; layout fixes
conflist solving