Remove Moveable (use Page), use Pagination, more DRY-ing