Changed design a bit fixed some stuff