new version of some files and some new classes with layout