Changed schema and introduced some css-magik