trying to fix width problem
still buggy
solved merge problem