layout modify
some naming problems in settings
search function finished