updated some stuff, layout bugs