Changed layout, decoupled some stuff