Cleenup, some fix for prebuild clasees, something for layout