new layout
fixed some stuff