Change of layout and new data base classes