changes of layout, fixed some bux, one remaining