change layout
fixing bugs