changed layout and some stuff