Add move bottom and top line
Rearrange some function names