small changes
try to fix database bug -> not successfull
layout rewrite, still layout bugs, but working