Use rebase instead of move
Fix margin
Do not deploy on build