fix position bugs