bug fixing. Layout improved